projects / emacs.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 7a70595) | patch
Add conflict detection/resolution to vc-hg (bug#10709)
authorGlenn Morris <rgm@gnu.org>
Wed, 5 Dec 2012 01:49:31 +0000 (20:49 -0500)
committerGlenn Morris <rgm@gnu.org>
Wed, 5 Dec 2012 01:49:31 +0000 (20:49 -0500)
commite1b2b9ac04b4bde2f086aa63f66ededfdbda4e0a
treeb4b6de46a0f559e1539ce6b7d0f95543d8991a76tree | snapshot
parent7a70595a4c9629e5b3139b068da9aa71e738b3d6commit | diff
Add conflict detection/resolution to vc-hg (bug#10709)

* lisp/vc/vc-hg.el (vc-hg-resolve-when-done, vc-hg-find-file-hook):
New functions, for detecting and resolving conflicts.
lisp/ChangeLog diff | blob | history
lisp/vc/vc-hg.el diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.